Patch from vishnu@pobox.com (Joshua N Pritikin) to emit signal at the

Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
	vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
	time, #59727

	* gtk/gtkbutton.c (gtk_button_update_state): Get depressed
	correctly.

diff --git a/ChangeLog b/ChangeLog
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6db0a6c00765aaba9330d9c60b5639626a68ad05..534b95f0e66f89f99b56db44fe43c3c5777fb6db 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sun Sep  2 17:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_deleted): Patch from
+       vishnu@pobox.com (Joshua N Pritikin) to emit signal at the correct
+       time, #59727
+
+       * gtk/gtkbutton.c (gtk_button_update_state): Get depressed
+       correctly.
+
 Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index a671ee640616e8c4d3afee035c4ea95c0279eb33..61cafd99674fefe7effc50f6a310fc64936cda1a 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1054,6 +1054,7 @@ gtk_button_finish_activate (GtkButton *button,
   gtk_grab_remove (widget);
 
   button->button_down = FALSE;
+
   gtk_button_update_state (button);
 
   if (do_it)
@@ -1224,8 +1225,8 @@ gtk_button_update_state (GtkButton *button)
   gboolean depressed;
   GtkStateType new_state;
 
-  depressed = button->in_button && button->button_down;
-      
+  depressed = button->button_down && (button->in_button || button->activate_timeout);
+
   if (!button->button_down && button->in_button)
     new_state = GTK_STATE_PRELIGHT;
   else

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1b53af30cf70e2fdf37fc237c5d754efd85f1603..5871fd3193449bc440985026727fc08a030de607 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4512,6 +4512,7 @@ gtk_tree_view_deleted (GtkTreeModel *model,
   GtkRBTree *tree;
   GtkRBNode *node;
   GList *list;
+  gint selection_changed;
 
   g_return_if_fail (path != NULL);
 
@@ -4524,8 +4525,7 @@ gtk_tree_view_deleted (GtkTreeModel *model,
   gtk_tree_row_reference_deleted (G_OBJECT (data), path);
 
   /* Change the selection */
-  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-    g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed");
+  selection_changed = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
 
   for (list = tree_view->priv->columns; list; list = list->next)
     if (((GtkTreeViewColumn *)list->data)->visible &&
@@ -4568,6 +4568,9 @@ gtk_tree_view_deleted (GtkTreeModel *model,
     }
 
   _gtk_tree_view_update_size (GTK_TREE_VIEW (data));
+
+  if (selection_changed)
+    g_signal_emit_by_name (G_OBJECT (tree_view->priv->selection), "changed");
 }